From 7b9361498f418c0ddca3ee202add13d24da0f0cd Mon Sep 17 00:00:00 2001
From: "cl349@firebug.cl.cam.ac.uk" <cl349@firebug.cl.cam.ac.uk>
Date: Thu, 2 Jun 2005 21:25:05 +0000
Subject: [PATCH] bitkeeper revision 1.1653 (429f7931iJ8kgS9qBlBbtyY9irorQA)

Many files:
  More include cleanups towards "include where it's used".
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
---
 xen/arch/x86/cpu/common.c         | 1 +
 xen/arch/x86/genapic/bigsmp.c     | 1 +
 xen/arch/x86/genapic/default.c    | 1 +
 xen/arch/x86/genapic/es7000.c     | 1 +
 xen/arch/x86/genapic/summit.c     | 1 +
 xen/arch/x86/irq.c                | 1 +
 xen/arch/x86/microcode.c          | 1 +
 xen/arch/x86/nmi.c                | 1 +
 xen/arch/x86/physdev.c            | 1 +
 xen/arch/x86/smp.c                | 1 +
 xen/arch/x86/smpboot.c            | 1 +
 xen/arch/x86/vmx_io.c             | 1 +
 xen/arch/x86/vmx_vmcs.c           | 1 +
 xen/arch/x86/x86_32/domain_page.c | 1 +
 xen/arch/x86/x86_32/mm.c          | 1 +
 xen/arch/x86/x86_32/traps.c       | 1 +
 xen/arch/x86/x86_64/mm.c          | 1 +
 xen/arch/x86/x86_64/traps.c       | 1 +
 xen/common/dom0_ops.c             | 1 +
 xen/common/dom_mem_ops.c          | 1 +
 xen/common/event_channel.c        | 1 +
 xen/common/multicall.c            | 1 +
 xen/drivers/char/console.c        | 1 +
 xen/include/asm-x86/shadow.h      | 1 +
 xen/include/asm-x86/smp.h         | 1 -
 xen/include/xen/softirq.h         | 1 +
 26 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
index 06a8142322..fcb5c16ecb 100644
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -3,6 +3,7 @@
 #include <xen/string.h>
 #include <xen/delay.h>
 #include <xen/smp.h>
+#include <asm/current.h>
 #include <asm/processor.h>
 #include <asm/i387.h>
 #include <asm/msr.h>
diff --git a/xen/arch/x86/genapic/bigsmp.c b/xen/arch/x86/genapic/bigsmp.c
index 1984b64825..93c00b9208 100644
--- a/xen/arch/x86/genapic/bigsmp.c
+++ b/xen/arch/x86/genapic/bigsmp.c
@@ -5,6 +5,7 @@
 #define APIC_DEFINITION 1
 #include <xen/config.h>
 #include <xen/cpumask.h>
+#include <asm/current.h>
 #include <asm/mpspec.h>
 #include <asm/genapic.h>
 #include <asm/fixmap.h>
diff --git a/xen/arch/x86/genapic/default.c b/xen/arch/x86/genapic/default.c
index 2fe4da78ea..d84cf41141 100644
--- a/xen/arch/x86/genapic/default.c
+++ b/xen/arch/x86/genapic/default.c
@@ -4,6 +4,7 @@
 #define APIC_DEFINITION 1
 #include <xen/config.h>
 #include <xen/cpumask.h>
+#include <asm/current.h>
 #include <asm/mpspec.h>
 #include <asm/mach-default/mach_apicdef.h>
 #include <asm/genapic.h>
diff --git a/xen/arch/x86/genapic/es7000.c b/xen/arch/x86/genapic/es7000.c
index 9e68384863..05e94b0f04 100644
--- a/xen/arch/x86/genapic/es7000.c
+++ b/xen/arch/x86/genapic/es7000.c
@@ -4,6 +4,7 @@
 #define APIC_DEFINITION 1
 #include <xen/config.h>
 #include <xen/cpumask.h>
+#include <asm/current.h>
 #include <asm/mpspec.h>
 #include <asm/genapic.h>
 #include <asm/fixmap.h>
diff --git a/xen/arch/x86/genapic/summit.c b/xen/arch/x86/genapic/summit.c
index bbca9d8632..28a47f09de 100644
--- a/xen/arch/x86/genapic/summit.c
+++ b/xen/arch/x86/genapic/summit.c
@@ -4,6 +4,7 @@
 #define APIC_DEFINITION 1
 #include <xen/config.h>
 #include <xen/cpumask.h>
+#include <asm/current.h>
 #include <asm/mpspec.h>
 #include <asm/genapic.h>
 #include <asm/fixmap.h>
diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index 88807d2b3d..4381331eeb 100644
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -11,6 +11,7 @@
 #include <xen/irq.h>
 #include <xen/perfc.h>
 #include <xen/sched.h>
+#include <asm/current.h>
 #include <asm/smpboot.h>
 
 irq_desc_t irq_desc[NR_IRQS];
diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c
index 83dd5c3501..a7bd0e5d68 100644
--- a/xen/arch/x86/microcode.c
+++ b/xen/arch/x86/microcode.c
@@ -77,6 +77,7 @@
 #include <xen/smp.h>
 #include <xen/spinlock.h>
 
+#include <asm/current.h>
 #include <asm/msr.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c
index 9357374381..0e03b6a674 100644
--- a/xen/arch/x86/nmi.c
+++ b/xen/arch/x86/nmi.c
@@ -22,6 +22,7 @@
 #include <xen/sched.h>
 #include <xen/console.h>
 #include <xen/smp.h>
+#include <asm/current.h>
 #include <asm/mc146818rtc.h>
 #include <asm/msr.h>
 #include <asm/mpspec.h>
diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c
index 94cf15e2eb..6eba1bfb22 100644
--- a/xen/arch/x86/physdev.c
+++ b/xen/arch/x86/physdev.c
@@ -6,6 +6,7 @@
 #include <xen/sched.h>
 #include <xen/irq.h>
 #include <xen/event.h>
+#include <asm/current.h>
 #include <asm/smpboot.h>
 #include <public/xen.h>
 #include <public/physdev.h>
diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c
index 9598ff2e93..7f108b240e 100644
--- a/xen/arch/x86/smp.c
+++ b/xen/arch/x86/smp.c
@@ -14,6 +14,7 @@
 #include <xen/delay.h>
 #include <xen/perfc.h>
 #include <xen/spinlock.h>
+#include <asm/current.h>
 #include <asm/smp.h>
 #include <asm/mc146818rtc.h>
 #include <asm/flushtlb.h>
diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
index 9249b88117..cfc2a57e46 100644
--- a/xen/arch/x86/smpboot.c
+++ b/xen/arch/x86/smpboot.c
@@ -40,6 +40,7 @@
 #include <xen/sched.h>
 #include <xen/irq.h>
 #include <xen/delay.h>
+#include <asm/current.h>
 #include <asm/mc146818rtc.h>
 #include <asm/desc.h>
 #include <asm/div64.h>
diff --git a/xen/arch/x86/vmx_io.c b/xen/arch/x86/vmx_io.c
index 294c017b2a..8b28217489 100644
--- a/xen/arch/x86/vmx_io.c
+++ b/xen/arch/x86/vmx_io.c
@@ -23,6 +23,7 @@
 #include <xen/errno.h>
 #include <xen/trace.h>
 
+#include <asm/current.h>
 #include <asm/cpufeature.h>
 #include <asm/processor.h>
 #include <asm/msr.h>
diff --git a/xen/arch/x86/vmx_vmcs.c b/xen/arch/x86/vmx_vmcs.c
index 472b1afbe5..fd332873e9 100644
--- a/xen/arch/x86/vmx_vmcs.c
+++ b/xen/arch/x86/vmx_vmcs.c
@@ -23,6 +23,7 @@
 #include <xen/lib.h>
 #include <xen/errno.h>
 
+#include <asm/current.h>
 #include <asm/cpufeature.h>
 #include <asm/processor.h>
 #include <asm/msr.h>
diff --git a/xen/arch/x86/x86_32/domain_page.c b/xen/arch/x86/x86_32/domain_page.c
index 08673b2986..40d0f8f964 100644
--- a/xen/arch/x86/x86_32/domain_page.c
+++ b/xen/arch/x86/x86_32/domain_page.c
@@ -15,6 +15,7 @@
 #include <xen/sched.h>
 #include <xen/mm.h>
 #include <xen/perfc.h>
+#include <asm/current.h>
 #include <asm/domain_page.h>
 #include <asm/flushtlb.h>
 #include <asm/hardirq.h>
diff --git a/xen/arch/x86/x86_32/mm.c b/xen/arch/x86/x86_32/mm.c
index 885f064ffb..b6786407cb 100644
--- a/xen/arch/x86/x86_32/mm.c
+++ b/xen/arch/x86/x86_32/mm.c
@@ -22,6 +22,7 @@
 #include <xen/lib.h>
 #include <xen/init.h>
 #include <xen/mm.h>
+#include <asm/current.h>
 #include <asm/page.h>
 #include <asm/flushtlb.h>
 #include <asm/fixmap.h>
diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c
index 98b6036c76..0507f3be0a 100644
--- a/xen/arch/x86/x86_32/traps.c
+++ b/xen/arch/x86/x86_32/traps.c
@@ -6,6 +6,7 @@
 #include <xen/console.h>
 #include <xen/mm.h>
 #include <xen/irq.h>
+#include <asm/current.h>
 #include <asm/flushtlb.h>
 
 #ifdef CONFIG_VMX
diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c
index 28c7da6590..fcc570ad7d 100644
--- a/xen/arch/x86/x86_64/mm.c
+++ b/xen/arch/x86/x86_64/mm.c
@@ -22,6 +22,7 @@
 #include <xen/init.h>
 #include <xen/mm.h>
 #include <xen/sched.h>
+#include <asm/current.h>
 #include <asm/asm_defns.h>
 #include <asm/page.h>
 #include <asm/flushtlb.h>
diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
index 3a33e72a4d..6fc5b32fea 100644
--- a/xen/arch/x86/x86_64/traps.c
+++ b/xen/arch/x86/x86_64/traps.c
@@ -8,6 +8,7 @@
 #include <xen/irq.h>
 #include <xen/console.h>
 #include <xen/sched.h>
+#include <asm/current.h>
 #include <asm/flushtlb.h>
 #include <asm/msr.h>
 
diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c
index aae2a1172c..74830d3dc7 100644
--- a/xen/common/dom0_ops.c
+++ b/xen/common/dom0_ops.c
@@ -18,6 +18,7 @@
 #include <xen/trace.h>
 #include <xen/console.h>
 #include <public/sched_ctl.h>
+#include <asm/current.h>
 
 extern long arch_do_dom0_op(dom0_op_t *op, dom0_op_t *u_dom0_op);
 extern void arch_getdomaininfo_ctxt(
diff --git a/xen/common/dom_mem_ops.c b/xen/common/dom_mem_ops.c
index 41a4406f0c..9e974be44d 100644
--- a/xen/common/dom_mem_ops.c
+++ b/xen/common/dom_mem_ops.c
@@ -14,6 +14,7 @@
 #include <xen/sched.h>
 #include <xen/event.h>
 #include <xen/shadow.h>
+#include <asm/current.h>
 #include <asm/domain_page.h>
 #include <asm/hardirq.h>
 
diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c
index 32e519bd1e..73fee6c38c 100644
--- a/xen/common/event_channel.c
+++ b/xen/common/event_channel.c
@@ -22,6 +22,7 @@
 #include <xen/sched.h>
 #include <xen/event.h>
 #include <xen/irq.h>
+#include <asm/current.h>
 
 #include <public/xen.h>
 #include <public/event_channel.h>
diff --git a/xen/common/multicall.c b/xen/common/multicall.c
index 3f6921353b..a3af8ef221 100644
--- a/xen/common/multicall.c
+++ b/xen/common/multicall.c
@@ -10,6 +10,7 @@
 #include <xen/sched.h>
 #include <xen/event.h>
 #include <xen/multicall.h>
+#include <asm/current.h>
 #include <asm/hardirq.h>
 
 struct mc_state mc_state[NR_CPUS];
diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index e2eda771d2..de106c149e 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -19,6 +19,7 @@
 #include <xen/keyhandler.h>
 #include <xen/mm.h>
 #include <xen/delay.h>
+#include <asm/current.h>
 #include <asm/uaccess.h>
 #include <asm/debugger.h>
 #include <asm/io.h>
diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
index d699c92dc0..d9eb792786 100644
--- a/xen/include/asm-x86/shadow.h
+++ b/xen/include/asm-x86/shadow.h
@@ -27,6 +27,7 @@
 #include <xen/perfc.h>
 #include <xen/sched.h>
 #include <xen/mm.h>
+#include <asm/current.h>
 #include <asm/flushtlb.h>
 #include <asm/processor.h>
 #include <asm/domain_page.h>
diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h
index 08995644e8..c70f4d90fc 100644
--- a/xen/include/asm-x86/smp.h
+++ b/xen/include/asm-x86/smp.h
@@ -8,7 +8,6 @@
 #include <xen/config.h>
 #include <xen/kernel.h>
 #include <xen/cpumask.h>
-#include <asm/current.h>
 #endif
 
 #ifdef CONFIG_X86_LOCAL_APIC
diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h
index de3480482a..87d6c807ee 100644
--- a/xen/include/xen/softirq.h
+++ b/xen/include/xen/softirq.h
@@ -17,6 +17,7 @@
 #include <xen/lib.h>
 #include <xen/smp.h>
 #include <asm/bitops.h>
+#include <asm/current.h>
 #include <asm/hardirq.h>
 
 typedef void (*softirq_handler)(void);
-- 
2.30.2